d/p: Update patches and remove 08 (applied upstream)

diff --git a/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch b/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch
index 964c29acdcfccaecc21323e10d6742c23190bf71..7d7ae7f89912e375a0b0ce29300ccb59505e9929 100644 (file)
--- a/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch
+++ b/debian/patches/04_Fixed-OFoptional-by-introducing-OFalign.patch
@@ -4,9 +4,9 @@ Date: Fri, 4 Jul 2014 12:02:51 +0200
 Subject: [PATCH] Fixed OFoptional by introducing OFalign?
 --- a/CMake/osconfig.h.in
 +++ b/CMake/osconfig.h.in
-@@ -1180,4 +1180,7 @@
- /* Define if we are supposed to use STL's system_error */
- #cmakedefine HAVE_STL_SYSTEM_ERROR @HAVE_STL_SYSTEM_ERROR@
+@@ -1223,4 +1223,7 @@
+ /* Define if the input iterator category is supported */
+ #cmakedefine HAVE_CONTIGUOUS_ITERATOR_CATEGORY @HAVE_CONTIGUOUS_ITERATOR_CATEGORY@
  
 +/* Define if the compiler supports __declspec(align) */
 +#cmakedefine HAVE_DECLSPEC_ALIGN
@@ -14,7 +14,7 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign?
  #endif /* !OSCONFIG_H*/
 --- a/config/aclocal.m4
 +++ b/config/aclocal.m4
-@@ -1971,6 +1971,47 @@
+@@ -1985,6 +1985,47 @@
      fi
  ])
  
@@ -64,9 +64,9 @@ Subject: [PATCH] Fixed OFoptional by introducing OFalign?
  dnl This macro checks if a given preprocessor symbol exists and is a string
 --- a/config/configure
 +++ b/config/configure
-@@ -16924,6 +16924,66 @@
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+@@ -17103,6 +17103,66 @@
+ 
+ 
  
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __alignof__" >&5
 +$as_echo_n "checking for __alignof__... " >&6; }

diff --git a/debian/patches/05_performance.patch b/debian/patches/05_performance.patch
index 0e46fec782ea7c6b47d657ab0976b46a4db7bd43..218b95c8ce5dd8e8e45174fcb8e3f7dc395df7e3 100644 (file)
--- a/debian/patches/05_performance.patch
+++ b/debian/patches/05_performance.patch
@@ -5,7 +5,7 @@ Author: Sebastien Jodogne <s.jodogne@chu.ulg.ac.be>
 Last-Update: Fri, 15 May 2015 16:39:01 UTC
 --- a/dcmnet/libsrc/dul.cc
 +++ b/dcmnet/libsrc/dul.cc
-@@ -1916,7 +1916,7 @@
+@@ -1913,7 +1913,7 @@
          msg += OFStandard::getLastNetworkErrorCode().message();
          return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
      }

diff --git a/debian/patches/08_remove_system_processor.patch b/debian/patches/08_remove_system_processor.patch
deleted file mode 100644 (file)
index 73978d8..0000000
--- a/debian/patches/08_remove_system_processor.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Remove the systemprocessor name in the compilate
- Required for reproducible builds, and it is also not reliable 
-Author: Gert Wollny <gw.fossdev@gmail.com>
-
---- a/CMake/dcmtkPrepare.cmake
-+++ b/CMake/dcmtkPrepare.cmake
-@@ -373,15 +373,6 @@
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L")
-   endif()
- 
--  option(DCMTK_FORCE_FPIC_ON_UNIX "Add -fPIC compiler flag on unix 64 bit machines to allow linking from dynamic libraries even if DCMTK is built statically" OFF)
--  mark_as_advanced(DCMTK_FORCE_FPIC_ON_UNIX)
--
--  # Setting for IA64 / x86_64 which needs -fPIC compiler flag required for shared library build on these platforms
--  if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND DCMTK_FORCE_FPIC_ON_UNIX)
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
--    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
--  endif()
--
- endif()
- 
- # define libraries and object files that must be linked to most Windows applications

diff --git a/debian/patches/series b/debian/patches/series
index 57fe4a946b1f23506fb499bfb379c93c9f914bff..2a9c1f808687290d2c617cffea351ae8b3549f58 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,6 @@
 01_dcmtk_3.6.0-1.patch
-#02_system_charls.patch
 03_datadic_install.patch
 04_Fixed-OFoptional-by-introducing-OFalign.patch
 05_performance.patch
 07_dont_export_all_executables.patch
-08_remove_system_processor.patch
-#09_charls-2.0.patch
+